From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 23 May 2014 15:14:20 +0000 (+0200)
Subject: viewSelector: Don't re-navigate into the active page
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2462
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c228a9a89a7f69aaba70690c527c21ed13a0926f;p=gnome-shell.git

viewSelector: Don't re-navigate into the active page

Starting keynav into the active page is handled from a key-press
handler on the stage, however we should not "start" keynav when
we are already navigating elsewhere - the latter can happen when
keynav fails (for instance because the focus is trapped inside an
open app folder or at the end of the dash), and the event bubbles
up to the stage. So make sure to only handle the event to actually
start keynav, to not interfere with the normal navigation handling.

Thanks to Carlos Soriano <carlos.soriano89@gmail.com> for the
debugging footwork.

https://bugzilla.gnome.org/show_bug.cgi?id=726760
---

diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 7dacc47bc..4d629793b 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -282,7 +282,7 @@ const ViewSelector = new Lang.Class({
             return Clutter.EVENT_STOP;
         } else if (this._shouldTriggerSearch(symbol)) {
             this.startSearch(event);
-        } else if (!this._searchActive) {
+        } else if (!this._searchActive && !global.stage.key_focus) {
             if (symbol == Clutter.Tab || symbol == Clutter.Down) {
                 this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
                 return true;